From 2c4f501f033ebb48dc4c804e56c1bcb6d2c622f5 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Mon, 6 Mar 2006 20:29:39 +0100 Subject: [PATCH] No need to re-set vm_pgoff before calling remap_pfn_range(). It will do it itself in cases where it is necessary. Signed-off-by: Keir Fraser --- linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c index c8671dbeb7..a130cbcf72 100644 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c @@ -957,9 +957,8 @@ static int xsd_kva_mmap(struct file *file, struct vm_area_struct *vma) if ((size > PAGE_SIZE) || (vma->vm_pgoff != 0)) return -EINVAL; - vma->vm_pgoff = mfn_to_pfn(xen_start_info->store_mfn); - - if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff, + if (remap_pfn_range(vma, vma->vm_start, + mfn_to_pfn(xen_start_info->store_mfn), size, vma->vm_page_prot)) return -EAGAIN; -- 2.30.2